From: Juanma Barranquero Date: Fri, 18 Sep 2009 16:55:21 +0000 (+0000) Subject: * server.el (server-ensure-safe-dir): Pass 'integer X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10411 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c957a78d5c4d1c2e7d4d34cf053f02784f4c43f9;p=emacs.git * server.el (server-ensure-safe-dir): Pass 'integer to `file-attributes', as suggested. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76144677c87..976b8190c22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-18 Juanma Barranquero + + * server.el (server-ensure-safe-dir): Pass 'integer + to `file-attributes', as suggested. + 2009-09-18 Stefan Monnier * dired-aux.el (dired-query-alist): Remove spurious backslash. diff --git a/lisp/server.el b/lisp/server.el index 610ace05590..f198ac83693 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -449,10 +449,10 @@ Creates the directory if necessary and makes sure: - it's owned by us - it's not readable/writable by anybody else." (setq dir (directory-file-name dir)) - (let ((attrs (file-attributes dir))) + (let ((attrs (file-attributes dir 'integer))) (unless attrs (letf (((default-file-modes) ?\700)) (make-directory dir t)) - (setq attrs (file-attributes dir))) + (setq attrs (file-attributes dir 'integer))) ;; Check that it's safe for use. (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid)) (or (eq system-type 'windows-nt)